Dev to stage conflicts 06 03 23 #1551

AqibYounasAtTkxel · 2023-03-06T17:30:06Z

Dev to stage conflicts 06 03 23

…_activity_search Case sensitive email fetching of the user was causing some deeplinkin…

…y_search_staging Merge pull request #1511 from ActiveLearningStudio/bugfix/CUR4655-ind…

…k-msteam-issue-commits cherry pick msteams issue commits

…k-msteams Release/cherry pick msteams

…iveLearningStudio-API into dev-to-stage-conflicts-06-03-23

gitguardian · 2023-03-06T17:30:10Z

⚠️ GitGuardian has uncovered 42 secrets following the scan of your pull request.

Please consider investigating the findings and remediating the incidents. Failure to do so may lead to compromising the associated services or software components.

🔎 Detected hardcoded secrets in your pull request

GitGuardian id	Secret	Commit	Filename
-	Generic High Entropy Secret	`f38f570`	charts/curriki/templates/client.yaml	View secret
-	Generic High Entropy Secret	`f38f570`	charts/curriki/templates/client.yaml	View secret
5885456	Generic High Entropy Secret	`f711ac8`	charts/curriki/templates/client.yaml	View secret
5885456	Generic High Entropy Secret	`f711ac8`	charts/curriki/templates/client.yaml	View secret
5885456	Generic High Entropy Secret	`d201258`	charts/curriki/templates/client.yaml	View secret
5885455	Generic High Entropy Secret	`aaab21b`	charts/curriki/templates/client.yaml	View secret
5885455	Generic High Entropy Secret	`aaab21b`	charts/curriki/templates/client.yaml	View secret
5885456	Generic High Entropy Secret	`aaab21b`	charts/curriki/templates/client.yaml	View secret
5885455	Generic High Entropy Secret	`aaab21b`	charts/curriki/templates/client.yaml	View secret
5885455	Generic High Entropy Secret	`2b67010`	charts/curriki/templates/client.yaml	View secret
5885455	Generic High Entropy Secret	`2b67010`	charts/curriki/templates/client.yaml	View secret
5885455	Generic High Entropy Secret	`f38f570`	charts/curriki/templates/client.yaml	View secret
5885455	Generic High Entropy Secret	`f38f570`	charts/pilots.yaml	View secret
5885455	Generic High Entropy Secret	`f38f570`	charts/pilots.yaml	View secret
5885455	Generic High Entropy Secret	`f38f570`	charts/staging.yaml	View secret
5885455	Generic High Entropy Secret	`f38f570`	charts/staging.yaml	View secret
5885455	Generic High Entropy Secret	`f38f570`	charts/staging.yaml	View secret
5885455	Generic High Entropy Secret	`f38f570`	charts/staging.yaml	View secret
5885455	Generic High Entropy Secret	`f38f570`	charts/staging.yaml	View secret
5885455	Generic High Entropy Secret	`f38f570`	charts/staging.yaml	View secret
5885455	Generic High Entropy Secret	`f38f570`	charts/staging.yaml	View secret
5885455	Generic High Entropy Secret	`f38f570`	charts/staging.yaml	View secret
5885455	Generic High Entropy Secret	`138e268`	charts/pilots.yaml	View secret
5885455	Generic High Entropy Secret	`138e268`	charts/pilots.yaml	View secret
5885455	Generic High Entropy Secret	`138e268`	charts/staging.yaml	View secret
5885455	Generic High Entropy Secret	`138e268`	charts/staging.yaml	View secret
5885455	Generic High Entropy Secret	`138e268`	charts/staging.yaml	View secret
5885455	Generic High Entropy Secret	`138e268`	charts/staging.yaml	View secret
5885455	Generic High Entropy Secret	`138e268`	charts/staging.yaml	View secret
5885455	Generic High Entropy Secret	`138e268`	charts/staging.yaml	View secret
5885455	Generic High Entropy Secret	`138e268`	charts/staging.yaml	View secret
5885455	Generic High Entropy Secret	`138e268`	charts/staging.yaml	View secret
5885455	Generic High Entropy Secret	`e84ac70`	charts/pilots.yaml	View secret
5885455	Generic High Entropy Secret	`e84ac70`	charts/pilots.yaml	View secret
5885455	Generic High Entropy Secret	`e84ac70`	charts/staging.yaml	View secret
5885455	Generic High Entropy Secret	`e84ac70`	charts/staging.yaml	View secret
5885455	Generic High Entropy Secret	`e84ac70`	charts/staging.yaml	View secret
5885455	Generic High Entropy Secret	`e84ac70`	charts/staging.yaml	View secret
5885455	Generic High Entropy Secret	`e84ac70`	charts/staging.yaml	View secret
5885455	Generic High Entropy Secret	`e84ac70`	charts/staging.yaml	View secret
5885455	Generic High Entropy Secret	`e84ac70`	charts/staging.yaml	View secret
5885455	Generic High Entropy Secret	`e84ac70`	charts/staging.yaml	View secret

🛠 Guidelines to remediate hardcoded secrets

Understand the implications of revoking this secret by investigating where it is used in your code.
Replace and store your secrets safely. Learn here the best practices.
Revoke and rotate these secrets.
If possible, rewrite git history. Rewriting git history is not a trivial act. You might completely break other contributing developers' workflow and you risk accidentally deleting legitimate data.

To avoid such incidents in the future consider

following these best practices for managing and storing secrets including API keys and other credentials
install secret detection on pre-commit to catch secret before it leaves your machine and ease remediation.

^{🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.

Our GitHub checks need improvements? Share your feedbacks!}

yesidevelop and others added 30 commits February 7, 2023 19:41

variables added

f711ac8

staging update

d201258

up

aaab21b

client variable updates for kubernetes

2b67010

pilots prod config

c375657

updated charts

f38f570

prod value updated

0281b7e

stage value updated

3b4d797

trax image updated

6a7ff5e

php-fpm added

2a0ebd8

nginx and fpm implemented

4f1e929

nginx and fpm implemented

f3ec7bd

added postgres extension

ce602e0

added postgres extension

2be6156

added postgres extension

56fc59c

cert paths update

8aa7565

updated api

6eebc90

variables updated

415d6a3

updated entrypoint

7671bb3

env added

a82d93c

env added

6016673

updated h5p

db92c26

type directory removed

253ee7f

previleged security added

dfc5567

hostpath removed

d363e39

Merge pull request #1511 from ActiveLearningStudio/bugfix/CUR4655-ind…

594e12b

…_activity_search Case sensitive email fetching of the user was causing some deeplinkin…

Merge pull request #1524 from ActiveLearningStudio/bugfix/ind_activit…

c8853e6

…y_search_staging Merge pull request #1511 from ActiveLearningStudio/bugfix/CUR4655-ind…

missing slash added

4416eff

Conflict resolve

37288d6

Merge pull request #1526 from ActiveLearningStudio/release/cherry-pic…

6f11935

…k-msteam-issue-commits cherry pick msteams issue commits

AqibYounasAtTkxel and others added 9 commits February 17, 2023 18:01

API to change status of an assignment is complete

802192e

scope for refresh token added

183d7c9

API to change status of an assignment is complete

6115533

removed unnecessary validation

ffd02e1

MSteams api cherry-pick

801ba1d

Update Jenkinsfile.api

57c437a

quick fix

93383a0

Merge pull request #1527 from ActiveLearningStudio/release/cherry-pic…

b75526a

…k-msteams Release/cherry pick msteams

Merge branch 'staging' of https://github.com/ActiveLearningStudio/Act…

138e268

…iveLearningStudio-API into dev-to-stage-conflicts-06-03-23

AqibYounasAtTkxel requested review from fahad-curriki and basit-tkxel March 6, 2023 17:30

yesidevelop added 3 commits March 6, 2023 22:44

removed ms secret

e84ac70

charts removed

bad624b

removed secret

f48427c

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Dev to stage conflicts 06 03 23 #1551

Dev to stage conflicts 06 03 23 #1551

Uh oh!

AqibYounasAtTkxel commented Mar 6, 2023

Uh oh!

gitguardian bot commented Mar 6, 2023 •

edited

Loading

Uh oh!

Uh oh!

Dev to stage conflicts 06 03 23 #1551

Are you sure you want to change the base?

Dev to stage conflicts 06 03 23 #1551

Uh oh!

Conversation

AqibYounasAtTkxel commented Mar 6, 2023

Uh oh!

gitguardian bot commented Mar 6, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

⚠️ GitGuardian has uncovered 42 secrets following the scan of your pull request.

Uh oh!

Uh oh!

gitguardian bot commented Mar 6, 2023 •

edited

Loading